From 1829a404a72d2777fdda29712461c99b2212d69d Mon Sep 17 00:00:00 2001 From: Hans van Kranenburg Date: Tue, 30 Jan 2018 19:22:43 +0100 Subject: [PATCH] debian/patches: categorize patches in subdirs Most of the patches are related to the prefix / abiname set. Sort out everything in sub directories, so it doesn't look completely like a big pile of garbage. --- .../{ => misc}/tools-include-install.diff | 0 ...tools-pygrub-remove-static-solaris-support | 0 .../{ => misc}/tools-xenmon-install.diff | 0 ...stestsx86_emulator-pass--no-pie--fno.patch | 0 debian/patches/{ => misc}/version.diff | 0 .../{ => prefix-abiname}/config-prefix.diff | 0 .../tools-blktap2-prefix.diff | 0 .../tools-console-prefix.diff | 0 .../tools-libfsimage-abiname.diff | 0 .../tools-libfsimage-prefix.diff | 0 .../tools-libxc-abiname.diff | 0 .../tools-libxl-abiname.diff | 0 .../tools-libxl-prefix.diff | 0 .../tools-misc-prefix.diff | 0 .../tools-pygrub-prefix.diff | 0 .../tools-python-prefix.diff | 0 .../{ => prefix-abiname}/tools-rpath.diff | 0 .../tools-xcutils-rpath.diff | 0 .../tools-xenmon-prefix.diff | 0 .../tools-xenpaging-prefix.diff | 0 .../tools-xenpmd-prefix.diff | 0 .../tools-xenstat-abiname.diff | 0 .../tools-xenstat-prefix.diff | 0 .../tools-xenstore-prefix.diff | 0 .../tools-xentoolcore-abiname.patch | 0 .../tools-xentrace-prefix.diff | 0 .../ubuntu-tools-libs-abiname.diff | 0 debian/patches/series | 66 +++++++++++-------- .../tools-fake-xs-restrict.patch | 0 .../tools-xenstore-compatibility.diff | 0 30 files changed, 37 insertions(+), 29 deletions(-) rename debian/patches/{ => misc}/tools-include-install.diff (100%) rename debian/patches/{ => misc}/tools-pygrub-remove-static-solaris-support (100%) rename debian/patches/{ => misc}/tools-xenmon-install.diff (100%) rename debian/patches/{ => misc}/toolstestsx86_emulator-pass--no-pie--fno.patch (100%) rename debian/patches/{ => misc}/version.diff (100%) rename debian/patches/{ => prefix-abiname}/config-prefix.diff (100%) rename debian/patches/{ => prefix-abiname}/tools-blktap2-prefix.diff (100%) rename debian/patches/{ => prefix-abiname}/tools-console-prefix.diff (100%) rename debian/patches/{ => prefix-abiname}/tools-libfsimage-abiname.diff (100%) rename debian/patches/{ => prefix-abiname}/tools-libfsimage-prefix.diff (100%) rename debian/patches/{ => prefix-abiname}/tools-libxc-abiname.diff (100%) rename debian/patches/{ => prefix-abiname}/tools-libxl-abiname.diff (100%) rename debian/patches/{ => prefix-abiname}/tools-libxl-prefix.diff (100%) rename debian/patches/{ => prefix-abiname}/tools-misc-prefix.diff (100%) rename debian/patches/{ => prefix-abiname}/tools-pygrub-prefix.diff (100%) rename debian/patches/{ => prefix-abiname}/tools-python-prefix.diff (100%) rename debian/patches/{ => prefix-abiname}/tools-rpath.diff (100%) rename debian/patches/{ => prefix-abiname}/tools-xcutils-rpath.diff (100%) rename debian/patches/{ => prefix-abiname}/tools-xenmon-prefix.diff (100%) rename debian/patches/{ => prefix-abiname}/tools-xenpaging-prefix.diff (100%) rename debian/patches/{ => prefix-abiname}/tools-xenpmd-prefix.diff (100%) rename debian/patches/{ => prefix-abiname}/tools-xenstat-abiname.diff (100%) rename debian/patches/{ => prefix-abiname}/tools-xenstat-prefix.diff (100%) rename debian/patches/{ => prefix-abiname}/tools-xenstore-prefix.diff (100%) rename debian/patches/{ => prefix-abiname}/tools-xentoolcore-abiname.patch (100%) rename debian/patches/{ => prefix-abiname}/tools-xentrace-prefix.diff (100%) rename debian/patches/{ => prefix-abiname}/ubuntu-tools-libs-abiname.diff (100%) rename debian/patches/{ => xenstore}/tools-fake-xs-restrict.patch (100%) rename debian/patches/{ => xenstore}/tools-xenstore-compatibility.diff (100%) diff --git a/debian/patches/tools-include-install.diff b/debian/patches/misc/tools-include-install.diff similarity index 100% rename from debian/patches/tools-include-install.diff rename to debian/patches/misc/tools-include-install.diff diff --git a/debian/patches/tools-pygrub-remove-static-solaris-support b/debian/patches/misc/tools-pygrub-remove-static-solaris-support similarity index 100% rename from debian/patches/tools-pygrub-remove-static-solaris-support rename to debian/patches/misc/tools-pygrub-remove-static-solaris-support diff --git a/debian/patches/tools-xenmon-install.diff b/debian/patches/misc/tools-xenmon-install.diff similarity index 100% rename from debian/patches/tools-xenmon-install.diff rename to debian/patches/misc/tools-xenmon-install.diff diff --git a/debian/patches/toolstestsx86_emulator-pass--no-pie--fno.patch b/debian/patches/misc/toolstestsx86_emulator-pass--no-pie--fno.patch similarity index 100% rename from debian/patches/toolstestsx86_emulator-pass--no-pie--fno.patch rename to debian/patches/misc/toolstestsx86_emulator-pass--no-pie--fno.patch diff --git a/debian/patches/version.diff b/debian/patches/misc/version.diff similarity index 100% rename from debian/patches/version.diff rename to debian/patches/misc/version.diff diff --git a/debian/patches/config-prefix.diff b/debian/patches/prefix-abiname/config-prefix.diff similarity index 100% rename from debian/patches/config-prefix.diff rename to debian/patches/prefix-abiname/config-prefix.diff diff --git a/debian/patches/tools-blktap2-prefix.diff b/debian/patches/prefix-abiname/tools-blktap2-prefix.diff similarity index 100% rename from debian/patches/tools-blktap2-prefix.diff rename to debian/patches/prefix-abiname/tools-blktap2-prefix.diff diff --git a/debian/patches/tools-console-prefix.diff b/debian/patches/prefix-abiname/tools-console-prefix.diff similarity index 100% rename from debian/patches/tools-console-prefix.diff rename to debian/patches/prefix-abiname/tools-console-prefix.diff diff --git a/debian/patches/tools-libfsimage-abiname.diff b/debian/patches/prefix-abiname/tools-libfsimage-abiname.diff similarity index 100% rename from debian/patches/tools-libfsimage-abiname.diff rename to debian/patches/prefix-abiname/tools-libfsimage-abiname.diff diff --git a/debian/patches/tools-libfsimage-prefix.diff b/debian/patches/prefix-abiname/tools-libfsimage-prefix.diff similarity index 100% rename from debian/patches/tools-libfsimage-prefix.diff rename to debian/patches/prefix-abiname/tools-libfsimage-prefix.diff diff --git a/debian/patches/tools-libxc-abiname.diff b/debian/patches/prefix-abiname/tools-libxc-abiname.diff similarity index 100% rename from debian/patches/tools-libxc-abiname.diff rename to debian/patches/prefix-abiname/tools-libxc-abiname.diff diff --git a/debian/patches/tools-libxl-abiname.diff b/debian/patches/prefix-abiname/tools-libxl-abiname.diff similarity index 100% rename from debian/patches/tools-libxl-abiname.diff rename to debian/patches/prefix-abiname/tools-libxl-abiname.diff diff --git a/debian/patches/tools-libxl-prefix.diff b/debian/patches/prefix-abiname/tools-libxl-prefix.diff similarity index 100% rename from debian/patches/tools-libxl-prefix.diff rename to debian/patches/prefix-abiname/tools-libxl-prefix.diff diff --git a/debian/patches/tools-misc-prefix.diff b/debian/patches/prefix-abiname/tools-misc-prefix.diff similarity index 100% rename from debian/patches/tools-misc-prefix.diff rename to debian/patches/prefix-abiname/tools-misc-prefix.diff diff --git a/debian/patches/tools-pygrub-prefix.diff b/debian/patches/prefix-abiname/tools-pygrub-prefix.diff similarity index 100% rename from debian/patches/tools-pygrub-prefix.diff rename to debian/patches/prefix-abiname/tools-pygrub-prefix.diff diff --git a/debian/patches/tools-python-prefix.diff b/debian/patches/prefix-abiname/tools-python-prefix.diff similarity index 100% rename from debian/patches/tools-python-prefix.diff rename to debian/patches/prefix-abiname/tools-python-prefix.diff diff --git a/debian/patches/tools-rpath.diff b/debian/patches/prefix-abiname/tools-rpath.diff similarity index 100% rename from debian/patches/tools-rpath.diff rename to debian/patches/prefix-abiname/tools-rpath.diff diff --git a/debian/patches/tools-xcutils-rpath.diff b/debian/patches/prefix-abiname/tools-xcutils-rpath.diff similarity index 100% rename from debian/patches/tools-xcutils-rpath.diff rename to debian/patches/prefix-abiname/tools-xcutils-rpath.diff diff --git a/debian/patches/tools-xenmon-prefix.diff b/debian/patches/prefix-abiname/tools-xenmon-prefix.diff similarity index 100% rename from debian/patches/tools-xenmon-prefix.diff rename to debian/patches/prefix-abiname/tools-xenmon-prefix.diff diff --git a/debian/patches/tools-xenpaging-prefix.diff b/debian/patches/prefix-abiname/tools-xenpaging-prefix.diff similarity index 100% rename from debian/patches/tools-xenpaging-prefix.diff rename to debian/patches/prefix-abiname/tools-xenpaging-prefix.diff diff --git a/debian/patches/tools-xenpmd-prefix.diff b/debian/patches/prefix-abiname/tools-xenpmd-prefix.diff similarity index 100% rename from debian/patches/tools-xenpmd-prefix.diff rename to debian/patches/prefix-abiname/tools-xenpmd-prefix.diff diff --git a/debian/patches/tools-xenstat-abiname.diff b/debian/patches/prefix-abiname/tools-xenstat-abiname.diff similarity index 100% rename from debian/patches/tools-xenstat-abiname.diff rename to debian/patches/prefix-abiname/tools-xenstat-abiname.diff diff --git a/debian/patches/tools-xenstat-prefix.diff b/debian/patches/prefix-abiname/tools-xenstat-prefix.diff similarity index 100% rename from debian/patches/tools-xenstat-prefix.diff rename to debian/patches/prefix-abiname/tools-xenstat-prefix.diff diff --git a/debian/patches/tools-xenstore-prefix.diff b/debian/patches/prefix-abiname/tools-xenstore-prefix.diff similarity index 100% rename from debian/patches/tools-xenstore-prefix.diff rename to debian/patches/prefix-abiname/tools-xenstore-prefix.diff diff --git a/debian/patches/tools-xentoolcore-abiname.patch b/debian/patches/prefix-abiname/tools-xentoolcore-abiname.patch similarity index 100% rename from debian/patches/tools-xentoolcore-abiname.patch rename to debian/patches/prefix-abiname/tools-xentoolcore-abiname.patch diff --git a/debian/patches/tools-xentrace-prefix.diff b/debian/patches/prefix-abiname/tools-xentrace-prefix.diff similarity index 100% rename from debian/patches/tools-xentrace-prefix.diff rename to debian/patches/prefix-abiname/tools-xentrace-prefix.diff diff --git a/debian/patches/ubuntu-tools-libs-abiname.diff b/debian/patches/prefix-abiname/ubuntu-tools-libs-abiname.diff similarity index 100% rename from debian/patches/ubuntu-tools-libs-abiname.diff rename to debian/patches/prefix-abiname/ubuntu-tools-libs-abiname.diff diff --git a/debian/patches/series b/debian/patches/series index 767a39c719..0148301f61 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,29 +1,37 @@ -version.diff -config-prefix.diff -tools-libfsimage-abiname.diff -tools-libxc-abiname.diff -tools-libxl-abiname.diff -tools-xenstat-abiname.diff -tools-rpath.diff -tools-blktap2-prefix.diff -tools-console-prefix.diff -tools-libfsimage-prefix.diff -tools-libxl-prefix.diff -tools-misc-prefix.diff -tools-pygrub-prefix.diff -tools-python-prefix.diff -tools-xcutils-rpath.diff -tools-xenmon-prefix.diff -tools-xenpaging-prefix.diff -tools-xenpmd-prefix.diff -tools-xenstat-prefix.diff -tools-xenstore-prefix.diff -tools-xentrace-prefix.diff -tools-pygrub-remove-static-solaris-support -tools-include-install.diff -tools-xenmon-install.diff -tools-xenstore-compatibility.diff -ubuntu-tools-libs-abiname.diff -toolstestsx86_emulator-pass--no-pie--fno.patch -tools-fake-xs-restrict.patch -tools-xentoolcore-abiname.patch +misc/version.diff + +# +# The following set of patches puts the hypervisor <-> tools ABI version into +# .so file names and changes paths where tools are installed to include this +# version number. +# +prefix-abiname/config-prefix.diff +prefix-abiname/tools-libfsimage-abiname.diff +prefix-abiname/tools-libxc-abiname.diff +prefix-abiname/tools-libxl-abiname.diff +prefix-abiname/tools-xenstat-abiname.diff +prefix-abiname/tools-rpath.diff +prefix-abiname/tools-blktap2-prefix.diff +prefix-abiname/tools-console-prefix.diff +prefix-abiname/tools-libfsimage-prefix.diff +prefix-abiname/tools-libxl-prefix.diff +prefix-abiname/tools-misc-prefix.diff +prefix-abiname/tools-pygrub-prefix.diff +prefix-abiname/tools-python-prefix.diff +prefix-abiname/tools-xcutils-rpath.diff +prefix-abiname/tools-xenmon-prefix.diff +prefix-abiname/tools-xenpaging-prefix.diff +prefix-abiname/tools-xenpmd-prefix.diff +prefix-abiname/tools-xenstat-prefix.diff +prefix-abiname/tools-xenstore-prefix.diff +prefix-abiname/tools-xentrace-prefix.diff +prefix-abiname/ubuntu-tools-libs-abiname.diff +prefix-abiname/tools-xentoolcore-abiname.patch + +misc/tools-include-install.diff +misc/tools-xenmon-install.diff +misc/tools-pygrub-remove-static-solaris-support +misc/toolstestsx86_emulator-pass--no-pie--fno.patch + +xenstore/tools-xenstore-compatibility.diff +xenstore/tools-fake-xs-restrict.patch diff --git a/debian/patches/tools-fake-xs-restrict.patch b/debian/patches/xenstore/tools-fake-xs-restrict.patch similarity index 100% rename from debian/patches/tools-fake-xs-restrict.patch rename to debian/patches/xenstore/tools-fake-xs-restrict.patch diff --git a/debian/patches/tools-xenstore-compatibility.diff b/debian/patches/xenstore/tools-xenstore-compatibility.diff similarity index 100% rename from debian/patches/tools-xenstore-compatibility.diff rename to debian/patches/xenstore/tools-xenstore-compatibility.diff -- 2.30.2